Merge branch 'next' of https://github.com/WoltLab/WCF into next
authorMarcel Werk <burntime@woltlab.com>
Thu, 1 Sep 2016 14:13:57 +0000 (16:13 +0200)
committerMarcel Werk <burntime@woltlab.com>
Thu, 1 Sep 2016 14:13:57 +0000 (16:13 +0200)

Trivial merge