Merge pull request #1971 from angeloc/master