Merge pull request #1596 from danielg4/master