Import recent changes from rbenv-versions