Merge 2.1.x into 3.0.x#571

ghostwriter merged 7 commits into3.0.xghostwriter/config:3.0.xfrom

merge-up/2.1.x-into-3.0.xghostwriter/config:merge-up/2.1.x-into-3.0.xCopy head branch name to clipboard