Merge branch 'release/2.1.0' into develop
authorChocobozzz <me@florianbigard.com>
Mon, 17 Feb 2020 14:44:53 +0000 (15:44 +0100)
committerChocobozzz <me@florianbigard.com>
Mon, 17 Feb 2020 14:44:53 +0000 (15:44 +0100)

Trivial merge