Merge branch 'release/2.1.0' into develop
authorChocobozzz <me@florianbigard.com>
Wed, 29 Jan 2020 13:42:02 +0000 (14:42 +0100)
committerChocobozzz <me@florianbigard.com>
Wed, 29 Jan 2020 13:42:02 +0000 (14:42 +0100)

Trivial merge