Merge branch 'next' of github.com:WoltLab/WCF into next
authorwoltlab.com <woltlab@woltlab.com>
Tue, 23 Aug 2016 16:50:10 +0000 (18:50 +0200)
committerwoltlab.com <woltlab@woltlab.com>
Tue, 23 Aug 2016 16:50:10 +0000 (18:50 +0200)

Trivial merge