Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Mon, 9 Jan 2017 17:08:04 +0000 (18:08 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 9 Jan 2017 17:08:04 +0000 (18:08 +0100)

Trivial merge