Merge branch 'next' of github.com:WoltLab/WCF into next
authorTim Düsterhus <duesterhus@woltlab.com>
Fri, 25 Mar 2016 22:57:05 +0000 (23:57 +0100)
committerTim Düsterhus <duesterhus@woltlab.com>
Fri, 25 Mar 2016 22:57:05 +0000 (23:57 +0100)

Trivial merge