I've merged jw/resume and jw/shell to master, and this cleanup patch too!

Thanks a lot!

Gregory