Merge pull request #8888 from ctiller/fixit10

clang-format code