Merge pull request #575 from eileenmcnaughton/4.3