Merge branch 'upstream-expat' into update-expat # By Expat Upstream * upstream-expat: expat 2022-02-20 (65a21f2b)