Final commit for CxxTest 4.2