Merge branch 'next' of github.com:WoltLab/WCF into next
authorAlexander Ebert <ebert@woltlab.com>
Sun, 5 Jun 2016 12:25:31 +0000 (14:25 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Sun, 5 Jun 2016 12:25:31 +0000 (14:25 +0200)

Trivial merge