Merge remote-tracking branch 'refs/remotes/origin/next'
authorAlexander Ebert <ebert@woltlab.com>
Thu, 22 Jun 2017 17:54:21 +0000 (19:54 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 22 Jun 2017 17:54:21 +0000 (19:54 +0200)

Trivial merge