Merge branch 'next' of github.com:WoltLab/WCF into next
authorAlexander Ebert <ebert@woltlab.com>
Mon, 26 Sep 2016 21:24:50 +0000 (23:24 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 26 Sep 2016 21:24:50 +0000 (23:24 +0200)

Trivial merge