Ported Fix for issue #123 to saxon95 branch
Merge branch 'saxon95-dev' into saxon95