Merge pull request #4779 from tru7/master