Break it clang format#971

johnmcfarlane wants to merge 2 commits intomainjohnmcfarlane/cnl:mainfrom

break-it_clang-formatjohnmcfarlane/cnl:break-it_clang-formatCopy head branch name to clipboard