Merge pull request #4379 from ermshiperete/master