Merge branch 'ff/apcups' into collectd-4.0