Merge branch '3.0'
authorMarcel Werk <burntime@woltlab.com>
Fri, 27 Sep 2019 14:27:31 +0000 (16:27 +0200)
committerMarcel Werk <burntime@woltlab.com>
Fri, 27 Sep 2019 14:27:31 +0000 (16:27 +0200)

Trivial merge