Merge branch 'upstream-expat' into update-expat

* upstream-expat:
  expat 2021-05-23 (a28238bd)