Merge commit 'origin/master' into for-ronnie
drwxr-xr-x - ctdb