Merge pull request #3634 from p-wassi/libexpat_220