Merge pull request #402 from eileenmcnaughton/4.3