do not linger on close
Merge branch 'master' into portable