Merge branch 'master' into working-dir-changes
-rwxr-xr-x 25189 cdist