- i18n: Clean up & tests added
Merge remote-tracking branch 'origin/master'