Preparations for Rails 4.1