Merge branch '2.0'
authorAlexander Ebert <ebert@woltlab.com>
Tue, 9 Sep 2014 10:03:37 +0000 (12:03 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 9 Sep 2014 10:03:37 +0000 (12:03 +0200)

Trivial merge