Merge branch 'next' of github.com:WoltLab/WCF into next
authorAlexander Ebert <ebert@woltlab.com>
Wed, 25 May 2016 08:33:21 +0000 (10:33 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 25 May 2016 08:33:21 +0000 (10:33 +0200)

Trivial merge