patched in Conor fix for sub-branching bugs from rhodri-devel