Reformat done with clang-3.5 svn200967
Merge pull request #4191 from sobkas/clang_r200967

Reformat done with clang-3.5 svn200967