Merge branch 'master' into next
authorTim Düsterhus <duesterhus@woltlab.com>
Mon, 15 Aug 2016 15:30:59 +0000 (17:30 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Mon, 15 Aug 2016 15:30:59 +0000 (17:30 +0200)

Trivial merge