Merge remote branch 'martins/takeover'
drwxr-xr-x - ctdb