Merge branch 'master' of github.com:wvmitchell/ruby
Merge branch 'master' of github.com:wvmitchell/ruby