Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Sat, 26 Nov 2016 11:39:46 +0000 (12:39 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Sat, 26 Nov 2016 11:39:46 +0000 (12:39 +0100)

Trivial merge