[pull] trunk from cli:trunk#155

pull[bot] merged 2 commits intodemaford:trunkdemaford/cli:trunkfrom

cli:trunkcli/cli:trunkCopy head branch name to clipboard