Doc hacking
Merge branch 'master' into cffi