* Rails 4.1.1
Merge branch 'hotfix/6.0.4'

* hotfix/6.0.4:
  * Rails 4.1.1