Merge pull request #3053 from collectd/code_owners