Merge pull request #232 from claco/master

Merged automatically by jenkins after successful build test
SNMP is back.