Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Tue, 8 Nov 2016 10:28:02 +0000 (11:28 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 8 Nov 2016 10:28:02 +0000 (11:28 +0100)

Trivial merge