Merge branch 'master' into next
authorAlexander Ebert <ebert@woltlab.com>
Sat, 20 Jun 2015 15:25:41 +0000 (17:25 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Sat, 20 Jun 2015 15:25:41 +0000 (17:25 +0200)

Trivial merge