Applied patch from bug #2810