Merge branch '2.0'
authorAlexander Ebert <ebert@woltlab.com>
Sat, 17 May 2014 13:19:46 +0000 (15:19 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Sat, 17 May 2014 13:19:46 +0000 (15:19 +0200)

Trivial merge