Merge branch 'next' of github.com:WoltLab/WCF into next
authorAlexander Ebert <ebert@woltlab.com>
Sat, 20 Aug 2016 18:17:58 +0000 (20:17 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Sat, 20 Aug 2016 18:17:58 +0000 (20:17 +0200)

Trivial merge