Merge pull request #8953 from ctiller/fixit25

clang-format