Applied patch from bug #2737