Merge branch '2.0'
authorAlexander Ebert <ebert@woltlab.com>
Tue, 10 Jun 2014 21:44:19 +0000 (23:44 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 10 Jun 2014 21:44:19 +0000 (23:44 +0200)

Trivial merge