This adds the missing parts from the upstream rbenv merge: f4652fbbf0 - e4cbf04592 - 3ee395f9b5
f4652fbbf0
e4cbf04592
3ee395f9b5
sed -e s/rbenv/pyenv/g