Merge from capistrano head