Merge commit 'ronnie-ctdb/master' into tridge