Merge pull request #241 from patchlevel/3.6.x-merge-up-into-3.7.x_zgs…

Merge pull request #241 from patchlevel/3.6.x-merge-up-into-3.7.x_zgs… #866