ffevotte Merge branch 'vterm-support' into master