Merge branch 'jdelvare-hwmon/master'