Merge branch 'next'
Merge branch 'master' into next
now catching ctrl-d (inspired by florianl/cssh)