Merge branch 'pull-495-fixes' of git://80x24.org/ruby into cachelined