Merge remote-tracking branch 'refs/remotes/origin/next'
authorAlexander Ebert <ebert@woltlab.com>
Wed, 12 Oct 2016 11:31:22 +0000 (13:31 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 12 Oct 2016 11:31:22 +0000 (13:31 +0200)

Trivial merge