Merge remote-tracking branch 'upstream/master' into check-snmp

Conflicts:
	plugins/snmp/check-snmp.rb
	plugins/snmp/snmp-metrics.rb