Update for Rails 4.2