Merge branch 'next' of github.com:WoltLab/WCF into next
authorAlexander Ebert <ebert@woltlab.com>
Fri, 22 Apr 2016 15:00:25 +0000 (17:00 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Fri, 22 Apr 2016 15:00:25 +0000 (17:00 +0200)

Trivial merge