Applied patch from bug #2756