Applied patch 966737bd91ed to fix the broken test suite.