Merge branch 'next' of github.com:WoltLab/WCF into next
authorAlexander Ebert <ebert@woltlab.com>
Wed, 6 Apr 2016 14:47:33 +0000 (16:47 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 6 Apr 2016 14:47:33 +0000 (16:47 +0200)

Trivial merge