Merge pull request #1741 from Borromini/master