Merge pull request #1807 from matteocontrini/master