Merge branch 'jc/waitpid' into next