Merge branch '3.0'
authorAlexander Ebert <ebert@woltlab.com>
Sat, 14 Apr 2018 11:05:59 +0000 (13:05 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Sat, 14 Apr 2018 11:05:59 +0000 (13:05 +0200)

Trivial merge