Merge branch 'stable' into mergeback/2.2.1
authorlain <lain@soykaf.club>
Wed, 23 Dec 2020 13:41:04 +0000 (14:41 +0100)
committerlain <lain@soykaf.club>
Wed, 23 Dec 2020 13:41:04 +0000 (14:41 +0100)

Trivial merge