Merge pull request #2761 from dago/patch-3