Merge pull request #3202 from dlahoti/patch-1