Applied patch from bug #2736