Merge pull request #461 from knocte/xbuild_improvements