Merge pull request #3691 from eileenmcnaughton/master