Merge branch '2.1' into 3.0
authorAlexander Ebert <ebert@woltlab.com>
Sun, 15 Apr 2018 21:10:55 +0000 (23:10 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Sun, 15 Apr 2018 21:10:55 +0000 (23:10 +0200)

Trivial merge