Merge pull request #1887 from dlobo/FormattingFixes