Merge branch 'master' into next
authorTim Düsterhus <duesterhus@woltlab.com>
Sun, 24 May 2015 12:47:46 +0000 (14:47 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Sun, 24 May 2015 12:47:46 +0000 (14:47 +0200)

Trivial merge