BenC: would these help (from 2.6.18 changelog) commit 2d15fd2f01fc76dc6856a5c551e32e4510f2b492 Author: Andrew de Quincey