Merge pull request #3413 from techee/config_comment