Applied patch to fix an assertion failure in the testsuite