Merge /u/jrubio/cdesktopenv/ branch implicit-int into master