Merge branch '3.0'
authorAlexander Ebert <ebert@woltlab.com>
Thu, 8 Mar 2018 13:26:09 +0000 (14:26 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 8 Mar 2018 13:26:09 +0000 (14:26 +0100)

Trivial merge