ongoing work
Merge branch 'python-generators-1-fix'