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