Merge pull request #1682 from Garciat/patch-1