Upgrade rails
Merge branch 'rails-update'