Downgrade to Rails 4.1.0 Foundation fix
Merge with local