Merge pull request #2867 from dgazineu/patch-1