Merge 0.1.x into 0.2.x#642

ghostwriter merged 8 commits into0.2.xghostwriter/shell:0.2.xfrom

merge-up/0.1.x-into-0.2.xghostwriter/shell:merge-up/0.1.x-into-0.2.xCopy head branch name to clipboard