Merge pull request #1266 from timw4mail/patch

Normalize comments in core files