Synced with GitHub CxxTest/cxxtest@985d5f0.