Merge branch '5.2'
authorTim Düsterhus <duesterhus@woltlab.com>
Wed, 8 Apr 2020 13:10:03 +0000 (15:10 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Wed, 8 Apr 2020 13:10:03 +0000 (15:10 +0200)

Trivial merge