Merge branch 'master' of ssh://git.code.sf.net/p/cdesktopenv/code
authorPeter Howkins <flibble@users.sf.net>
Mon, 2 Apr 2018 19:32:56 +0000 (20:32 +0100)
committerPeter Howkins <flibble@users.sf.net>
Mon, 2 Apr 2018 19:32:56 +0000 (20:32 +0100)

Trivial merge