Merge branch 'master' into next
authorTim Düsterhus <duesterhus@woltlab.com>
Thu, 8 Jun 2017 14:48:26 +0000 (16:48 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Thu, 8 Jun 2017 14:48:26 +0000 (16:48 +0200)

Trivial merge