Attaching updated version of patch based on current trunk (r12572)
(original one no longer applies - please review new version)
Attaching updated version of patch based on current trunk (r12572)
(original one no longer applies - please review new version)