Merge pull request #444 from knocte/xbuild_improvements