Merge remote-tracking branch 'citrix/master' into build-temp