Fix valgrind failures on master due to race in new IPC code.
Merge branch 'origin/master'