Merge branch 'next' of github.com:WoltLab/WCF into next
authorAlexander Ebert <ebert@woltlab.com>
Tue, 27 Sep 2016 09:44:03 +0000 (11:44 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 27 Sep 2016 09:44:03 +0000 (11:44 +0200)

Trivial merge