Fix a silly memory leak
Merge branch 'scrollback-autosave'
Merge branch 'master' into mouse