Merge branch 'master' into next
authorTim Düsterhus <duesterhus@woltlab.com>
Mon, 1 Aug 2016 14:41:16 +0000 (16:41 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Mon, 1 Aug 2016 14:41:16 +0000 (16:41 +0200)

Trivial merge