Merge pull request #2345 from akoeplinger/xbuild14