Merge branch 'release/v1.3.0' into develop
authorChocobozzz <me@florianbigard.com>
Fri, 24 May 2019 12:31:10 +0000 (14:31 +0200)
committerChocobozzz <me@florianbigard.com>
Fri, 24 May 2019 12:31:10 +0000 (14:31 +0200)

Trivial merge