Merge /u/jrubio/cdesktopenv/ branch int-conversion into master
drwxr-xr-x - cde