Merge pull request #1963 from angeloc/patch-1