Merge branch 'hotfix/1.25.6' into stable
ruby-2.1.0
Merge branch 'master' of github.com:wayneeseguin/rvm

Conflicts:
	config/db
make 2.1.0 default for ruby
1.25.7
Merge branch 'master' into hotfix/1.25.7
Merge branch 'hotfix/1.25.7'