More formatting fixes.
Merge pull request #1081 from sylus/7.x-1.x

More formatting fixes.