Merge branch 'upstream/rbenv'
Update to 0.4.0+9