Merge remote-tracking branch 'github/pr/1396'
authorFlorian Forster <octo@collectd.org>
Sat, 6 Aug 2016 18:51:01 +0000 (20:51 +0200)
committerFlorian Forster <octo@collectd.org>
Sat, 6 Aug 2016 18:51:01 +0000 (20:51 +0200)

Trivial merge