Merge pull request #1829 from rubenk/clang-format