Merge branch '3.0'
authorAlexander Ebert <ebert@woltlab.com>
Tue, 21 Nov 2017 18:54:01 +0000 (19:54 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 21 Nov 2017 18:54:01 +0000 (19:54 +0100)

Trivial merge