Merge branch '3.0'
authorAlexander Ebert <ebert@woltlab.com>
Sat, 19 May 2018 11:43:03 +0000 (13:43 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Sat, 19 May 2018 11:43:03 +0000 (13:43 +0200)

Trivial merge