bundle update
Merge branch 'master' into rails-3-2