Merge branch 'cooperate-with-capistrano-rbenv' into integrated