Merge branch 'master' into next
authorTim Düsterhus <duesterhus@woltlab.com>
Mon, 22 Jun 2015 16:34:57 +0000 (18:34 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Mon, 22 Jun 2015 16:34:57 +0000 (18:34 +0200)

Trivial merge