Merge branch 'release/1.4.0' into develop
authorChocobozzz <me@florianbigard.com>
Fri, 6 Sep 2019 07:47:55 +0000 (09:47 +0200)
committerChocobozzz <me@florianbigard.com>
Fri, 6 Sep 2019 07:47:55 +0000 (09:47 +0200)

Trivial merge