Merge remote-tracking branch 'refs/remotes/origin/3.0'
authorMarcel Werk <burntime@woltlab.com>
Sun, 25 Mar 2018 21:58:10 +0000 (23:58 +0200)
committerMarcel Werk <burntime@woltlab.com>
Sun, 25 Mar 2018 21:58:10 +0000 (23:58 +0200)

Trivial merge