Merge pull request #2760 from msva/patch-6