Merge pull request #1995 from br101/master