Merge pull request #756 from akoeplinger/fix-xmlreader