Merge pull request #3934 from JosJuice/comment-formatting Undo some comment formatting changes from b5104a7
