Merge pull request #1762 from eileenmcnaughton/4.3