Merge branch 'next' of github.com:WoltLab/WCF into next
authorAlexander Ebert <ebert@woltlab.com>
Thu, 28 Jul 2016 21:30:21 +0000 (23:30 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 28 Jul 2016 21:30:21 +0000 (23:30 +0200)

Trivial merge