Merge branch 'release/1.4.0' into develop
authorChocobozzz <me@florianbigard.com>
Tue, 3 Sep 2019 13:43:47 +0000 (15:43 +0200)
committerChocobozzz <me@florianbigard.com>
Tue, 3 Sep 2019 13:43:47 +0000 (15:43 +0200)

Trivial merge