Merge branch '2.0' into 2.1
authorAlexander Ebert <ebert@woltlab.com>
Fri, 24 Feb 2017 16:31:56 +0000 (17:31 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Fri, 24 Feb 2017 16:31:56 +0000 (17:31 +0100)

Trivial merge