Merge branch 'next' of github.com:WoltLab/WCF into next
authorTim Düsterhus <duesterhus@woltlab.com>
Wed, 1 Jun 2016 16:10:56 +0000 (18:10 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Wed, 1 Jun 2016 16:10:56 +0000 (18:10 +0200)

Trivial merge