Merge commit 'obnox/ctdb-wip-trans3' into trans3