Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Tue, 25 Oct 2016 09:46:37 +0000 (11:46 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 25 Oct 2016 09:46:37 +0000 (11:46 +0200)

Trivial merge