Merge remote-tracking branch 'github/pr/1952'

diff --cc src/cpu.c
Simple merge

diff --cc src/hddtemp.c
Simple merge

diff --cc src/lvm.c
Simple merge