Trivial formatting rebased from #995
Merge pull request #1023 from mtbc/trac-10338-trivia

Trivial formatting rebased from #995