Merge branch '2.0'
authorAlexander Ebert <ebert@woltlab.com>
Tue, 19 Aug 2014 18:49:17 +0000 (20:49 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 19 Aug 2014 18:49:17 +0000 (20:49 +0200)

Trivial merge