Backport of fix for #158

We're using Rails 3.0.17, so we need this bug to be fixed on i18n 0.5.