Merged tridge's ctdb branch.