Merge pull request #7321 from eileenmcnaughton/master