Merge remote-tracking branch 'refs/remotes/origin/3.0'
authorMarcel Werk <burntime@woltlab.com>
Tue, 26 Jun 2018 16:46:51 +0000 (18:46 +0200)
committerMarcel Werk <burntime@woltlab.com>
Tue, 26 Jun 2018 16:46:51 +0000 (18:46 +0200)

Trivial merge