Merge i18n and new build scripts from upstream