Merge branch 'cde-next' of ssh://git.code.sf.net/p/cdesktopenv/code into cde-next
authorPeter Howkins <flibble@users.sf.net>
Fri, 29 Jun 2018 18:30:04 +0000 (19:30 +0100)
committerPeter Howkins <flibble@users.sf.net>
Fri, 29 Jun 2018 18:30:04 +0000 (19:30 +0100)

Trivial merge