Merge pull request #581 from libexpat/fix-windows-installer

Fix windows installer (related to #555, follow-up to #570)