Merge branch '2.0'
authorAlexander Ebert <ebert@woltlab.com>
Mon, 31 Aug 2015 21:53:44 +0000 (23:53 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 31 Aug 2015 21:53:44 +0000 (23:53 +0200)

Trivial merge