Merged r12365 from trunk to 2.4-stable
prevent i18n deprecated warning
i18n 0.6.4 on Rails 3.2.16 changes behavior. https://github.com/svenfuchs/i18n/commit/3b6e56e06fd70f6e4507996b017238505e66608c
Authored by: marutosijp 2013-12-07
Parent: [r12365]
Child: [r12367]
