Merge remote-tracking branch 'refs/remotes/origin/3.0'
authorMarcel Werk <burntime@woltlab.com>
Thu, 14 Dec 2017 10:45:16 +0000 (11:45 +0100)
committerMarcel Werk <burntime@woltlab.com>
Thu, 14 Dec 2017 10:45:16 +0000 (11:45 +0100)

Trivial merge