tidy new multisession
Merge remote-tracking branch 'origin/master' into configuration