Merge branch '3.0'
authorAlexander Ebert <ebert@woltlab.com>
Sat, 10 Mar 2018 00:20:13 +0000 (01:20 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Sat, 10 Mar 2018 00:20:13 +0000 (01:20 +0100)

Trivial merge