Merge pull request #1297 from Azure/andrew/docfix_5_26_v2