Merge branch 'martins'
drwxr-xr-x - ctdb