ActiveModel demodulize and underscore fix
ActiveModel underscore fix fix
These @model_name are strings already
Merge pull request #1607 from istana/rails-4

another rails 4 compatibility fix