Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Fri, 6 Oct 2017 17:11:20 +0000 (19:11 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Fri, 6 Oct 2017 17:11:20 +0000 (19:11 +0200)

Trivial merge