Rails 4.1-ready