applied to 2.6 verbatim, applied to 2.4 slightly modified (2.4 patch 
attached, and DaveM CC added).