Merge pull request #1714 from gennadiycivil/master

Formatting tweaks, no functionality changes