Merge pull request #1631 from pmoranga/patch-1