Merge branch 'release/2.1.0'
authorChocobozzz <me@florianbigard.com>
Thu, 27 Feb 2020 08:09:50 +0000 (09:09 +0100)
committerChocobozzz <me@florianbigard.com>
Thu, 27 Feb 2020 08:09:50 +0000 (09:09 +0100)

Trivial merge