Merge branch 'working-dir-changes'
-rwxr-xr-x 23693 cdist