Merge branch 'next' into python-generator