Merge branch 'master' of ssh://git.code.sf.net/p/cdesktopenv/code
authorJon Trulson <jon@radscan.com>
Sun, 24 Feb 2019 19:56:10 +0000 (12:56 -0700)
committerJon Trulson <jon@radscan.com>
Sun, 24 Feb 2019 19:56:10 +0000 (12:56 -0700)

Trivial merge