Merge branch 'next' of github.com:WoltLab/WCF into next
authorAlexander Ebert <ebert@woltlab.com>
Thu, 2 Mar 2017 12:15:08 +0000 (13:15 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 2 Mar 2017 12:15:08 +0000 (13:15 +0100)

Trivial merge