Merged I18N branch to head.