Make update hook work with rvm-installed ruby
Merge remote-tracking branch 'upstream/master'
Pass arguments from hooks/update to hooks/update.rb
Merge remote-tracking branch 'upstream/master'