Merge branch '3.0'
authorMarcel Werk <burntime@woltlab.com>
Sun, 1 Apr 2018 10:42:07 +0000 (12:42 +0200)
committerMarcel Werk <burntime@woltlab.com>
Sun, 1 Apr 2018 10:42:07 +0000 (12:42 +0200)

Trivial merge