Merge pull request #940 from tru7/apcupsd