Merge changes into rails_upgrade