Merge branch 'hotfix/1.25.20' into stable
1.25.21
Merge branch 'master' into hotfix/1.25.21
Merge branch 'hotfix/1.25.21'
handle fact that RUBY_VERSION not being set in rvm's env
Merge pull request #2726 from mwlang/after_use_textmate_hook

handle fact that RUBY_VERSION not being set in rvm's env