Merge branch 'next' of github.com:WoltLab/WCF into next
authorTim Düsterhus <duesterhus@woltlab.com>
Mon, 6 Jun 2016 15:39:44 +0000 (17:39 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Mon, 6 Jun 2016 15:39:44 +0000 (17:39 +0200)

Trivial merge