Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Wed, 20 Dec 2017 22:38:57 +0000 (23:38 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 20 Dec 2017 22:38:57 +0000 (23:38 +0100)

Trivial merge