Implementing missing cleanup on premature abort.
Merge branch 'master' of github.com:jautz/shenv