Merge pull request #1286 from Azure/andrew/GHIssue_1139