Merge branch 'next' of https://github.com/WoltLab/WCF into next
authorMarcel Werk <burntime@woltlab.com>
Wed, 31 Aug 2016 17:04:20 +0000 (19:04 +0200)
committerMarcel Werk <burntime@woltlab.com>
Wed, 31 Aug 2016 17:04:20 +0000 (19:04 +0200)

Trivial merge