Merge branch '2.1' into 3.0
authorAlexander Ebert <ebert@woltlab.com>
Fri, 4 Aug 2017 13:10:18 +0000 (15:10 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Fri, 4 Aug 2017 13:10:18 +0000 (15:10 +0200)

Trivial merge