Merge branch 'next' of github.com:WoltLab/WCF into next
authorMatthias Schmidt <gravatronics@live.com>
Mon, 12 Nov 2018 19:32:20 +0000 (20:32 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Mon, 12 Nov 2018 19:32:20 +0000 (20:32 +0100)

Trivial merge