Merge branch '2.0' into 2.1
authorAlexander Ebert <ebert@woltlab.com>
Thu, 6 Apr 2017 11:48:01 +0000 (13:48 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 6 Apr 2017 11:48:01 +0000 (13:48 +0200)

Trivial merge