Auto-Merge pull request #3203 from dago/netsnmpagent