Rails 4 updates
Merge pull request #1244 from stephankaag/rails4updates

Rails 4 updates