Merge pull request #6404 from eileenmcnaughton/master