Merge pull request #5286 from eileenmcnaughton/master