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

Trivial merge