Merge branch '2.0'
authorAlexander Ebert <ebert@woltlab.com>
Sat, 26 Sep 2015 13:27:10 +0000 (15:27 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Sat, 26 Sep 2015 13:27:10 +0000 (15:27 +0200)

Trivial merge