Merge branch 'master' (and upstream) into extra_timeout_and_unreachable_tests

Conflicts:
	test/test_net_ping_external.rb
Merge branch 'extra_timeout_and_unreachable_tests' into fix_ICMP_ENETUNREACH_BUG

Conflicts:
	test/test_net_ping_external.rb