Merge pull request #4153 from br101/master