ActiveSupport 4.1, removed deprecations
Merge branch 'update_dep'