Merge branch '3.0'
authorAlexander Ebert <ebert@woltlab.com>
Fri, 20 Apr 2018 15:50:45 +0000 (17:50 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Fri, 20 Apr 2018 15:50:45 +0000 (17:50 +0200)

Trivial merge