Merge branch 'release/2.2.0' into develop
authorChocobozzz <me@florianbigard.com>
Tue, 2 Jun 2020 09:18:29 +0000 (11:18 +0200)
committerChocobozzz <me@florianbigard.com>
Tue, 2 Jun 2020 09:18:29 +0000 (11:18 +0200)

Trivial merge