Merge /u/jrubio/cdesktopenv/ branch discarded-qualifiers into master
drwxr-xr-x - cde