Merge branch 'next' of github.com:WoltLab/WCF into next
authorwoltlab.com <woltlab@woltlab.com>
Fri, 26 Jun 2015 10:49:38 +0000 (12:49 +0200)
committerwoltlab.com <woltlab@woltlab.com>
Fri, 26 Jun 2015 10:49:38 +0000 (12:49 +0200)

Trivial merge