Merge pull request #6090 from eileenmcnaughton/master