Merge branch 'master' into stream-reuse

diff --cc services/outside_network.c
Simple merge

diff --cc services/outside_network.h
Simple merge

diff --cc testcode/fake_event.c
Simple merge