Merge pull request #6979 from eileenmcnaughton/master