Merge branch 'master' into next
authorAlexander Ebert <ebert@woltlab.com>
Mon, 8 Jun 2015 10:01:33 +0000 (12:01 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 8 Jun 2015 10:01:33 +0000 (12:01 +0200)

Trivial merge