Merge pull request #3033 from akoeplinger/fix-xbuild