Merge branch 'next' of https://github.com/WoltLab/WCF into next
authorMarcel Werk <burntime@woltlab.com>
Thu, 16 Jun 2016 10:54:50 +0000 (12:54 +0200)
committerMarcel Werk <burntime@woltlab.com>
Thu, 16 Jun 2016 10:54:50 +0000 (12:54 +0200)

Trivial merge