Merge branch 'pexpect:master' into modern_async