Import changes from recent rbenv