Merge branch 'next' of github.com:WoltLab/WCF into next
authorAlexander Ebert <ebert@woltlab.com>
Thu, 16 Mar 2017 11:50:06 +0000 (12:50 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 16 Mar 2017 11:50:06 +0000 (12:50 +0100)

Trivial merge