[pull] trunk from cli:trunk#24

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

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