Merge pull request #668 from libexpat/issue-667-prepare-release

Prepare release 2.5.0 (part of #667)