Merge branch 'master' into develop # Conflicts: #	README.md #	config.gypi #	icuWrapper.cpp #	index.js #	package-lock.json #	package.json #	vendor/icu/common/bmpset.cpp #	vendor/icu/common/brkeng.cpp #	vendor/icu/common/bytesinkutil.cpp #	vendor/icu/common/bytesinkutil.h #	vendor/icu/common/bytestriebuilder.cpp #	vendor/icu/common/charstr.cpp #	vendor/icu/common/charstr.h #	vendor/icu/common/cmemory.h #	vendor/icu/common/dictbe.cpp #	vendor/icu/common/dictionarydata.h #	vendor/icu/common/edits.cpp #	vendor/icu/common/hash.h #	vendor/icu/common/loadednormalizer2impl.cpp #	vendor/icu/common/localsvc.h #	vendor/icu/common/locavailable.cpp #	vendor/icu/common/locdispnames.cpp #	vendor/icu/common/locdspnm.cpp #	vendor/icu/common/locid.cpp #	vendor/icu/common/loclikely.cpp #	vendor/icu/common/locmap.cpp #	vendor/icu/common/locmap.h #	vendor/icu/common/locresdata.cpp #	vendor/icu/common/locutil.cpp #	vendor/icu/common/mutex.h #	vendor/icu/common/norm2_nfc_data.h #	vendor/icu/common/normalizer2.cpp #	vendor/icu/common/normalizer2impl.cpp #	vendor/icu/common/normalizer2impl.h #	vendor/icu/common/normlzr.cpp #	vendor/icu/common/patternprops.cpp #	vendor/icu/common/patternprops.h #	vendor/icu/common/propname_data.h #	vendor/icu/common/putil.cpp #	vendor/icu/common/putilimp.h #	vendor/icu/common/rbbi.cpp #	vendor/icu/common/rbbi_cache.cpp #	vendor/icu/common/rbbi_cache.h #	vendor/icu/common/rbbidata.cpp #	vendor/icu/common/rbbidata.h #	vendor/icu/common/rbbirb.cpp #	vendor/icu/common/rbbirb.h #	vendor/icu/common/rbbiscan.cpp #	vendor/icu/common/rbbiscan.h #	vendor/icu/common/rbbisetb.cpp #	vendor/icu/common/rbbisetb.h #	vendor/icu/common/rbbitblb.cpp #	vendor/icu/common/rbbitblb.h #	vendor/icu/common/resbund.cpp #	vendor/icu/common/serv.cpp #	vendor/icu/common/servls.cpp #	vendor/icu/common/servnotf.cpp #	vendor/icu/common/sharedobject.h #	vendor/icu/common/simpleformatter.cpp #	vendor/icu/common/stringtriebuilder.cpp #	vendor/icu/common/uassert.h #	vendor/icu/common/ubidi.cpp #	vendor/icu/common/ubidi_props_data.h #	vendor/icu/common/ubidiln.cpp #	vendor/icu/common/ubiditransform.cpp #	vendor/icu/common/ubidiwrt.cpp #	vendor/icu/common/ucase.cpp #	vendor/icu/common/ucase.h #	vendor/icu/common/ucase_props_data.h #	vendor/icu/common/uchar.cpp #	vendor/icu/common/uchar_props_data.h #	vendor/icu/common/ucln_cmn.cpp #	vendor/icu/common/ucln_cmn.h #	vendor/icu/common/ucnv.cpp #	vendor/icu/common/ucnv2022.cpp #	vendor/icu/common/ucnv_bld.cpp #	vendor/icu/common/ucnv_bld.h #	vendor/icu/common/ucnv_ct.cpp #	vendor/icu/common/ucnv_u16.cpp #	vendor/icu/common/ucnv_u32.cpp #	vendor/icu/common/ucnv_u8.cpp #	vendor/icu/common/ucnvhz.cpp #	vendor/icu/common/ucnvmbcs.cpp #	vendor/icu/common/ucnvsel.cpp #	vendor/icu/common/ucol_swp.cpp #	vendor/icu/common/ucurr.cpp #	vendor/icu/common/ucurrimp.h #	vendor/icu/common/udata.cpp #	vendor/icu/common/udataswp.h #	vendor/icu/common/uhash.cpp #	vendor/icu/common/uinvchar.cpp #	vendor/icu/common/uinvchar.h #	vendor/icu/common/uloc.cpp #	vendor/icu/common/uloc_keytype.cpp #	vendor/icu/common/uloc_tag.cpp #	vendor/icu/common/ulocimp.h #	vendor/icu/common/umapfile.cpp #	vendor/icu/common/umapfile.h #	vendor/icu/common/umutex.cpp #	vendor/icu/common/umutex.h #	vendor/icu/common/unames.cpp #	vendor/icu/common/unicode/brkiter.h #	vendor/icu/common/unicode/bytestream.h #	vendor/icu/common/unicode/bytestriebuilder.h #	vendor/icu/common/unicode/caniter.h #	vendor/icu/common/unicode/casemap.h #	vendor/icu/common/unicode/char16ptr.h #	vendor/icu/common/unicode/docmain.h #	vendor/icu/common/unicode/dtintrv.h #	vendor/icu/common/unicode/edits.h #	vendor/icu/common/unicode/enumset.h #	vendor/icu/common/unicode/filteredbrk.h #	vendor/icu/common/unicode/icuplug.h #	vendor/icu/common/unicode/localpointer.h #	vendor/icu/common/unicode/locdspnm.h #	vendor/icu/common/unicode/locid.h #	vendor/icu/common/unicode/messagepattern.h #	vendor/icu/common/unicode/normalizer2.h #	vendor/icu/common/unicode/parsepos.h #	vendor/icu/common/unicode/platform.h #	vendor/icu/common/unicode/ptypes.h #	vendor/icu/common/unicode/rbbi.h #	vendor/icu/common/unicode/simpleformatter.h #	vendor/icu/common/unicode/stringoptions.h #	vendor/icu/common/unicode/stringtriebuilder.h #	vendor/icu/common/unicode/ubidi.h #	vendor/icu/common/unicode/ubiditransform.h #	vendor/icu/common/unicode/uchar.h #	vendor/icu/common/unicode/ucnv.h #	vendor/icu/common/unicode/uconfig.h #	vendor/icu/common/unicode/ucurr.h #	vendor/icu/common/unicode/uenum.h #	vendor/icu/common/unicode/umachine.h #	vendor/icu/common/unicode/uniset.h #	vendor/icu/common/unicode/unistr.h #	vendor/icu/common/unicode/uobject.h #	vendor/icu/common/unicode/urename.h #	vendor/icu/common/unicode/ures.h #	vendor/icu/common/unicode/uscript.h #	vendor/icu/common/unicode/uset.h #	vendor/icu/common/unicode/ustring.h #	vendor/icu/common/unicode/utext.h #	vendor/icu/common/unicode/utf16.h #	vendor/icu/common/unicode/utf8.h #	vendor/icu/common/unicode/utypes.h #	vendor/icu/common/unicode/uvernum.h #	vendor/icu/common/unifiedcache.cpp #	vendor/icu/common/unifiedcache.h #	vendor/icu/common/uniset.cpp #	vendor/icu/common/uniset_closure.cpp #	vendor/icu/common/uniset_props.cpp #	vendor/icu/common/unistr.cpp #	vendor/icu/common/uobject.cpp #	vendor/icu/common/uprops.cpp #	vendor/icu/common/uprops.h #	vendor/icu/common/uresbund.cpp #	vendor/icu/common/uresdata.h #	vendor/icu/common/uresimp.h #	vendor/icu/common/uscript.cpp #	vendor/icu/common/uscript_props.cpp #	vendor/icu/common/uset.cpp #	vendor/icu/common/usetiter.cpp #	vendor/icu/common/ushape.cpp #	vendor/icu/common/usprep.cpp #	vendor/icu/common/ustr_cnv.cpp #	vendor/icu/common/ustr_titlecase_brkiter.cpp #	vendor/icu/common/ustrcase.cpp #	vendor/icu/common/utext.cpp #	vendor/icu/common/util.h #	vendor/icu/common/utrace.cpp #	vendor/icu/common/utrie.h #	vendor/icu/common/utrie2.cpp #	vendor/icu/common/utrie2.h #	vendor/icu/common/utrie2_builder.cpp #	vendor/icu/common/utrie2_impl.h #	vendor/icu/common/uts46.cpp #	vendor/icu/common/utypes.cpp #	vendor/icu/common/uvector.h #	vendor/icu/common/uvectr32.h #	vendor/icu/common/uvectr64.h #	vendor/icu/common/wintz.cpp #	vendor/icu/common/wintz.h #	vendor/icu/i18n/alphaindex.cpp #	vendor/icu/i18n/anytrans.cpp #	vendor/icu/i18n/astro.cpp #	vendor/icu/i18n/brktrans.cpp #	vendor/icu/i18n/calendar.cpp #	vendor/icu/i18n/chnsecal.cpp #	vendor/icu/i18n/coll.cpp #	vendor/icu/i18n/collationbuilder.cpp #	vendor/icu/i18n/collationdatabuilder.cpp #	vendor/icu/i18n/collationfcd.cpp #	vendor/icu/i18n/collationkeys.cpp #	vendor/icu/i18n/collationruleparser.cpp #	vendor/icu/i18n/compactdecimalformat.cpp #	vendor/icu/i18n/csdetect.cpp #	vendor/icu/i18n/csrmbcs.cpp #	vendor/icu/i18n/currfmt.cpp #	vendor/icu/i18n/currfmt.h #	vendor/icu/i18n/currpinf.cpp #	vendor/icu/i18n/currunit.cpp #	vendor/icu/i18n/datefmt.cpp #	vendor/icu/i18n/dcfmtsym.cpp #	vendor/icu/i18n/decNumberLocal.h #	vendor/icu/i18n/decimfmt.cpp #	vendor/icu/i18n/double-conversion-bignum-dtoa.cpp #	vendor/icu/i18n/double-conversion-bignum.cpp #	vendor/icu/i18n/double-conversion-bignum.h #	vendor/icu/i18n/double-conversion-cached-powers.cpp #	vendor/icu/i18n/double-conversion-ieee.h #	vendor/icu/i18n/double-conversion-utils.h #	vendor/icu/i18n/double-conversion.cpp #	vendor/icu/i18n/double-conversion.h #	vendor/icu/i18n/dtfmtsym.cpp #	vendor/icu/i18n/dtitvfmt.cpp #	vendor/icu/i18n/dtitvinf.cpp #	vendor/icu/i18n/dtptngen.cpp #	vendor/icu/i18n/dtptngen_impl.h #	vendor/icu/i18n/fmtable.cpp #	vendor/icu/i18n/fmtableimp.h #	vendor/icu/i18n/fphdlimp.cpp #	vendor/icu/i18n/fphdlimp.h #	vendor/icu/i18n/fpositer.cpp #	vendor/icu/i18n/gender.cpp #	vendor/icu/i18n/gregocal.cpp #	vendor/icu/i18n/gregoimp.h #	vendor/icu/i18n/indiancal.cpp #	vendor/icu/i18n/indiancal.h #	vendor/icu/i18n/islamcal.cpp #	vendor/icu/i18n/japancal.cpp #	vendor/icu/i18n/japancal.h #	vendor/icu/i18n/listformatter.cpp #	vendor/icu/i18n/measfmt.cpp #	vendor/icu/i18n/measunit.cpp #	vendor/icu/i18n/msgfmt.cpp #	vendor/icu/i18n/nfrule.cpp #	vendor/icu/i18n/nfrule.h #	vendor/icu/i18n/nfsubs.cpp #	vendor/icu/i18n/number_affixutils.cpp #	vendor/icu/i18n/number_affixutils.h #	vendor/icu/i18n/number_compact.cpp #	vendor/icu/i18n/number_compact.h #	vendor/icu/i18n/number_decimalquantity.cpp #	vendor/icu/i18n/number_decimalquantity.h #	vendor/icu/i18n/number_decimfmtprops.cpp #	vendor/icu/i18n/number_decimfmtprops.h #	vendor/icu/i18n/number_fluent.cpp #	vendor/icu/i18n/number_formatimpl.cpp #	vendor/icu/i18n/number_formatimpl.h #	vendor/icu/i18n/number_grouping.cpp #	vendor/icu/i18n/number_integerwidth.cpp #	vendor/icu/i18n/number_longnames.cpp #	vendor/icu/i18n/number_longnames.h #	vendor/icu/i18n/number_modifiers.cpp #	vendor/icu/i18n/number_modifiers.h #	vendor/icu/i18n/number_notation.cpp #	vendor/icu/i18n/number_padding.cpp #	vendor/icu/i18n/number_patternmodifier.cpp #	vendor/icu/i18n/number_patternmodifier.h #	vendor/icu/i18n/number_patternstring.cpp #	vendor/icu/i18n/number_patternstring.h #	vendor/icu/i18n/number_rounding.cpp #	vendor/icu/i18n/number_roundingutils.h #	vendor/icu/i18n/number_scientific.cpp #	vendor/icu/i18n/number_scientific.h #	vendor/icu/i18n/number_stringbuilder.cpp #	vendor/icu/i18n/number_stringbuilder.h #	vendor/icu/i18n/number_types.h #	vendor/icu/i18n/number_utils.h #	vendor/icu/i18n/numfmt.cpp #	vendor/icu/i18n/numsys.cpp #	vendor/icu/i18n/numsys_impl.h #	vendor/icu/i18n/olsontz.cpp #	vendor/icu/i18n/plurfmt.cpp #	vendor/icu/i18n/plurrule.cpp #	vendor/icu/i18n/plurrule_impl.h #	vendor/icu/i18n/quantityformatter.cpp #	vendor/icu/i18n/quantityformatter.h #	vendor/icu/i18n/rbnf.cpp #	vendor/icu/i18n/rbt.cpp #	vendor/icu/i18n/rbt.h #	vendor/icu/i18n/rbt_pars.cpp #	vendor/icu/i18n/rbtz.cpp #	vendor/icu/i18n/regexcmp.cpp #	vendor/icu/i18n/region.cpp #	vendor/icu/i18n/reldatefmt.cpp #	vendor/icu/i18n/reldtfmt.cpp #	vendor/icu/i18n/reldtfmt.h #	vendor/icu/i18n/rematch.cpp #	vendor/icu/i18n/rulebasedcollator.cpp #	vendor/icu/i18n/scientificnumberformatter.cpp #	vendor/icu/i18n/scriptset.cpp #	vendor/icu/i18n/scriptset.h #	vendor/icu/i18n/shareddateformatsymbols.h #	vendor/icu/i18n/simpletz.cpp #	vendor/icu/i18n/smpdtfmt.cpp #	vendor/icu/i18n/timezone.cpp #	vendor/icu/i18n/tmunit.cpp #	vendor/icu/i18n/tmutfmt.cpp #	vendor/icu/i18n/translit.cpp #	vendor/icu/i18n/transreg.cpp #	vendor/icu/i18n/tridpars.cpp #	vendor/icu/i18n/tzfmt.cpp #	vendor/icu/i18n/tzgnames.cpp #	vendor/icu/i18n/tzgnames.h #	vendor/icu/i18n/tznames.cpp #	vendor/icu/i18n/tznames_impl.cpp #	vendor/icu/i18n/ucln_in.h #	vendor/icu/i18n/ucol_res.cpp #	vendor/icu/i18n/udat.cpp #	vendor/icu/i18n/udateintervalformat.cpp #	vendor/icu/i18n/ulistformatter.cpp #	vendor/icu/i18n/ulocdata.cpp #	vendor/icu/i18n/umsg.cpp #	vendor/icu/i18n/unicode/alphaindex.h #	vendor/icu/i18n/unicode/calendar.h #	vendor/icu/i18n/unicode/coll.h #	vendor/icu/i18n/unicode/compactdecimalformat.h #	vendor/icu/i18n/unicode/currpinf.h #	vendor/icu/i18n/unicode/currunit.h #	vendor/icu/i18n/unicode/datefmt.h #	vendor/icu/i18n/unicode/dcfmtsym.h #	vendor/icu/i18n/unicode/decimfmt.h #	vendor/icu/i18n/unicode/dtitvfmt.h #	vendor/icu/i18n/unicode/dtitvinf.h #	vendor/icu/i18n/unicode/dtptngen.h #	vendor/icu/i18n/unicode/fmtable.h #	vendor/icu/i18n/unicode/fpositer.h #	vendor/icu/i18n/unicode/gender.h #	vendor/icu/i18n/unicode/listformatter.h #	vendor/icu/i18n/unicode/measfmt.h #	vendor/icu/i18n/unicode/measunit.h #	vendor/icu/i18n/unicode/msgfmt.h #	vendor/icu/i18n/unicode/nounit.h #	vendor/icu/i18n/unicode/numberformatter.h #	vendor/icu/i18n/unicode/numfmt.h #	vendor/icu/i18n/unicode/numsys.h #	vendor/icu/i18n/unicode/plurfmt.h #	vendor/icu/i18n/unicode/plurrule.h #	vendor/icu/i18n/unicode/rbnf.h #	vendor/icu/i18n/unicode/regex.h #	vendor/icu/i18n/unicode/region.h #	vendor/icu/i18n/unicode/reldatefmt.h #	vendor/icu/i18n/unicode/scientificnumberformatter.h #	vendor/icu/i18n/unicode/smpdtfmt.h #	vendor/icu/i18n/unicode/timezone.h #	vendor/icu/i18n/unicode/translit.h #	vendor/icu/i18n/unicode/tzfmt.h #	vendor/icu/i18n/unicode/ucal.h #	vendor/icu/i18n/unicode/ucol.h #	vendor/icu/i18n/unicode/udat.h #	vendor/icu/i18n/unicode/udateintervalformat.h #	vendor/icu/i18n/unicode/udatpg.h #	vendor/icu/i18n/unicode/ugender.h #	vendor/icu/i18n/unicode/ulistformatter.h #	vendor/icu/i18n/unicode/unum.h #	vendor/icu/i18n/unicode/unumsys.h #	vendor/icu/i18n/unicode/upluralrules.h #	vendor/icu/i18n/unicode/uregex.h #	vendor/icu/i18n/unicode/ureldatefmt.h #	vendor/icu/i18n/unicode/usearch.h #	vendor/icu/i18n/unicode/uspoof.h #	vendor/icu/i18n/upluralrules.cpp #	vendor/icu/i18n/uregex.cpp #	vendor/icu/i18n/usearch.cpp #	vendor/icu/i18n/uspoof.cpp #	vendor/icu/i18n/uspoof_build.cpp #	vendor/icu/i18n/uspoof_conf.cpp #	vendor/icu/i18n/uspoof_impl.cpp #	vendor/icu/i18n/uspoof_impl.h #	vendor/icu/i18n/vtzone.cpp #	vendor/icu/i18n/windtfmt.cpp #	vendor/icu/i18n/zonemeta.cpp #	vendor/icu/tools/escapesrc/escapesrc.cpp #	vendor/icu/tools/genrb/genrb.cpp #	vendor/icu/tools/genrb/parse.cpp #	vendor/icu/tools/genrb/reslist.cpp #	vendor/icu/tools/genrb/reslist.h #	vendor/icu/tools/pkgdata/pkgdata.cpp #	vendor/icu/tools/toolutil/filestrm.cpp #	vendor/icu/tools/toolutil/filetools.cpp #	vendor/icu/tools/toolutil/package.cpp #	vendor/icu/tools/toolutil/pkg_genc.cpp #	vendor/icu/tools/toolutil/pkg_gencmn.cpp #	vendor/icu/tools/toolutil/swapimpl.cpp #	vendor/icu/tools/toolutil/toolutil.cpp #	vendor/icu/tools/toolutil/ucbuf.cpp #	vendor/icu/tools/toolutil/ucmstate.cpp #	vendor/icu/tools/toolutil/udbgutil.cpp #	vendor/icu/tools/toolutil/unewdata.cpp #	vendor/icu/tools/toolutil/writesrc.cpp #	vendor/icu/tools/toolutil/writesrc.h