rails/rails — pull request #16899 by matt423 (2014-09-12 14:44:48+00:00)
Title: Backport inflection fix to Rails 3.2

I just want to backport these commits to 3.2 since we need them in our live project.