Merge branch '1.3' of 10.1.1.27:/shared/ctdb/ctdb-git into 1.3