Merge branch 'next' of github.com:WoltLab/WCF into next
authorAlexander Ebert <ebert@woltlab.com>
Wed, 25 May 2016 09:34:49 +0000 (11:34 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 25 May 2016 09:34:49 +0000 (11:34 +0200)

Trivial merge