Merge 0.2.x into 1.0.x#771

ghostwriter merged 5 commits into1.0.xghostwriter/shell:1.0.xfrom

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