Copied branch l10n_co_base into master