Merge pull request #695 from ValMenn/xplat_build_update