Merge from tridge
drwxr-xr-x - ctdb