Merge branch 'next' of github.com:WoltLab/WCF into next
authorMatthias Schmidt <gravatronics@live.com>
Wed, 8 Aug 2018 04:36:25 +0000 (06:36 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Wed, 8 Aug 2018 04:36:25 +0000 (06:36 +0200)

Trivial merge