Merge branch 'master' of ssh://git.code.sf.net/p/cdesktopenv/code
authorPeter Howkins <flibble@users.sf.net>
Wed, 4 Apr 2018 15:37:12 +0000 (16:37 +0100)
committerPeter Howkins <flibble@users.sf.net>
Wed, 4 Apr 2018 15:37:12 +0000 (16:37 +0100)

Trivial merge