Import recent changes from rbenv 0.4.0