Merge commit 'ctdb-ronnie/master'