Merge remote-tracking branch 'refs/remotes/origin/3.0'
authorMarcel Werk <burntime@woltlab.com>
Thu, 7 Dec 2017 17:36:57 +0000 (18:36 +0100)
committerMarcel Werk <burntime@woltlab.com>
Thu, 7 Dec 2017 17:36:57 +0000 (18:36 +0100)

Trivial merge