Merge branch 'next' of github.com:WoltLab/WCF into next
authorAlexander Ebert <ebert@woltlab.com>
Tue, 23 Aug 2016 10:34:15 +0000 (12:34 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 23 Aug 2016 10:34:15 +0000 (12:34 +0200)

Trivial merge