Merge branch '3.0'
authorAlexander Ebert <ebert@woltlab.com>
Tue, 13 Mar 2018 12:18:14 +0000 (13:18 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 13 Mar 2018 12:18:14 +0000 (13:18 +0100)

Trivial merge