Merge remote-tracking branch 'six8/rbenv'