Upgrade to Rails 3.2.19
Fix merge conflicts.