Merge branch 'master' of github.com:WoltLab/WCF 3.1.6
authorAlexander Ebert <ebert@woltlab.com>
Mon, 15 Oct 2018 13:11:53 +0000 (15:11 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 15 Oct 2018 13:11:53 +0000 (15:11 +0200)

Trivial merge