Merge pull request #2759 from msva/patch-5