Merge pull request #2966 from eileenmcnaughton/patch-2