Merge pull request #6196 from eileenmcnaughton/master