ongoing work
Merge branch 'python-generators-3-fix2'