Merge branch 'doc-and-test-max-canon' of github.com:pexpect/pexpect into doc-and-test-max-canon
Merge branch 'doc-and-test-max-canon' of github.com:pexpect/pexpect into doc-and-test-max-canon