Merge pull request #1800 from blaggacao/8.0-l10n_co