Code

Auto-Merge pull request #2540 from octo/cid/141009
authorcollectd bot <32910397+collectd-bot@users.noreply.github.com>
Fri, 17 Nov 2017 13:29:29 +0000 (14:29 +0100)
committerGitHub <noreply@github.com>
Fri, 17 Nov 2017 13:29:29 +0000 (14:29 +0100)
Automatically merged due to "Automerge" label


Trivial merge