Merge "Add support for JSON i18n files"