Cherry pick of data race fix (#29) to master#34

dcristoloveanu merged 1 commit intomasterAzure/vld:masterfrom

cherry-pick-data-race-fixAzure/vld:cherry-pick-data-race-fixCopy head branch name to clipboard