rails/rails — pull request #15905 by amiel (2014-06-24 18:44:32+00:00)
Title: Include ActiveModel::Naming instead of extend

This is basically #15889, but incorporating the feedback from @rafaelfranca.