category globalize3 fix
Merge branch 'globalize3' into i18n