From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Mon, 19 Feb 2018 15:14:01 +0000 (+0100)
Subject: Merge branch 'collectd-5.7' into collectd-5.8
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=1159cb5d383c55a80a0db100b8f7aadcf44740a5

Merge branch 'collectd-5.7' into collectd-5.8
---

1159cb5d383c55a80a0db100b8f7aadcf44740a5