Ctrl+Del in edit lines
Merge branch 'master' into fileassoc