Bring in changes necessary for Rails 4.1