Migrated from Rails 4.0 to 4.1