Merge branch 'pr/2629' into develop
authorChocobozzz <me@florianbigard.com>
Wed, 15 Apr 2020 12:16:40 +0000 (14:16 +0200)
committerChocobozzz <me@florianbigard.com>
Wed, 15 Apr 2020 12:16:40 +0000 (14:16 +0200)

Trivial merge