Merge pull request #2168 from remakeelectric/app-snmpd