Merge branch 'release/2.2.0' into develop
authorChocobozzz <me@florianbigard.com>
Wed, 20 May 2020 11:53:51 +0000 (13:53 +0200)
committerChocobozzz <me@florianbigard.com>
Wed, 20 May 2020 11:53:51 +0000 (13:53 +0200)

Trivial merge