Merge branch '2.0' 2.1.7
authorAlexander Ebert <ebert@woltlab.com>
Mon, 7 Sep 2015 08:39:57 +0000 (10:39 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 7 Sep 2015 08:39:57 +0000 (10:39 +0200)

Trivial merge