Merge branch 'next' of github.com:WoltLab/WCF into next
authorAlexander Ebert <ebert@woltlab.com>
Thu, 25 Aug 2016 15:37:36 +0000 (17:37 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 25 Aug 2016 15:37:36 +0000 (17:37 +0200)

Trivial merge