Merge pull request #3977 from techee/filetype_groups