Merge branch 'jc/waitpid'