Added patch from bug #2752