Patch for fix for bug #12441 waiting to be merged