- Patch #278592 by catch, Dave Reid, andypost, lilou, sun, tobiasb: sync 6.x extra updates with HEAD.