Merge branch 'release/1.4.0' into develop
authorChocobozzz <me@florianbigard.com>
Thu, 22 Aug 2019 15:16:48 +0000 (17:16 +0200)
committerChocobozzz <me@florianbigard.com>
Thu, 22 Aug 2019 15:16:48 +0000 (17:16 +0200)

Trivial merge