Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Thu, 10 Aug 2017 12:26:37 +0000 (14:26 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 10 Aug 2017 12:26:37 +0000 (14:26 +0200)

Trivial merge