Merge branch 'vendor/EXPAT'