Merge pull request #4166 from mwarning/master