Merge branch 'issue-415-release-expat-2-2-10' (#415)