Merge branch 'release/v1.2.0'
authorChocobozzz <me@florianbigard.com>
Wed, 6 Feb 2019 11:26:58 +0000 (12:26 +0100)
committerChocobozzz <me@florianbigard.com>
Wed, 6 Feb 2019 11:26:58 +0000 (12:26 +0100)

Trivial merge