Changes for Rails 4.1