Merge branch 'master' of github.com:WoltLab/WCF
authorMatthias Schmidt <gravatronics@live.com>
Fri, 25 Aug 2017 11:40:36 +0000 (13:40 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Fri, 25 Aug 2017 11:40:36 +0000 (13:40 +0200)

Trivial merge