Capistrano 3.x-style.
Merge branch 'master' into rails-3-2