Fixed i18n override problem with rails 4
Merge pull request #1264 from thiagofm/upstream

Fixed i18n override problem with rails 4