Merge branch 'next' of github.com:WoltLab/WCF into next
authorAlexander Ebert <ebert@woltlab.com>
Sun, 21 Aug 2016 21:03:44 +0000 (23:03 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Sun, 21 Aug 2016 21:03:44 +0000 (23:03 +0200)

Trivial merge