FYI, the WIP patch does not seem to apply cleanly anymore using the latest HEAD.
See the cfbot rebase logs [1].
------[1] http://cfbot.cputube.org/patch_42_4225.log
Kind Regards,Peter Smith.Fujitsu Australia