Merge pull request #2826 from tru7/apcupsd