Merge /u/jrubio/cdesktopenv/ branch incompatible-pointer-types into master 2.3.0a
drwxr-xr-x - cde