Merge remote-tracking branch 'upstream/master' into ipv6.init_connection