Updated rbenv.
More commits for rbenv.
Merge branch 'master' into develop

* master:
  More commits for rbenv.
  Updated rbenv.