Merge branch 'release/2.2.0' into develop
authorChocobozzz <me@florianbigard.com>
Mon, 25 May 2020 07:00:13 +0000 (09:00 +0200)
committerChocobozzz <me@florianbigard.com>
Mon, 25 May 2020 07:00:13 +0000 (09:00 +0200)

Trivial merge