Merge branch 'workaround-for-rvm-capistrano' into integrated