Merge branch 'master' into next
authorTim Düsterhus <duesterhus@woltlab.com>
Thu, 1 Sep 2016 16:00:06 +0000 (18:00 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Thu, 1 Sep 2016 16:00:06 +0000 (18:00 +0200)

Trivial merge