Merge branch '5.2'
authorTim Düsterhus <duesterhus@woltlab.com>
Wed, 8 Apr 2020 18:21:33 +0000 (20:21 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Wed, 8 Apr 2020 18:21:33 +0000 (20:21 +0200)

Trivial merge