Merge branch 'upstream-expat' into update-expat

* upstream-expat:
  expat 2024-03-13 (fa75b965)