[networking-guide] master: updates from my upstream version (52d64f4)