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

Trivial merge