Merge branch 'release/2.2.0' into develop
authorChocobozzz <me@florianbigard.com>
Fri, 22 May 2020 09:55:55 +0000 (11:55 +0200)
committerChocobozzz <me@florianbigard.com>
Fri, 22 May 2020 09:55:55 +0000 (11:55 +0200)

Trivial merge