Merge remote-tracking branch 'harenome/ping' into ping_icmp
Merge remote-tracking branch 'jeremy/ping_icmp' into ping