Merge branch '2.1' into 3.0
authorAlexander Ebert <ebert@woltlab.com>
Mon, 31 Dec 2018 18:50:58 +0000 (19:50 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 31 Dec 2018 18:50:58 +0000 (19:50 +0100)

Trivial merge