Merge /u/jrubio/cdesktopenv/ branch delete-incomplete into master
drwxr-xr-x - cde