Merge branch '3.0'
authorMarcel Werk <burntime@woltlab.com>
Tue, 24 Jul 2018 09:06:41 +0000 (11:06 +0200)
committerMarcel Werk <burntime@woltlab.com>
Tue, 24 Jul 2018 09:06:41 +0000 (11:06 +0200)

Trivial merge