Integrating changes from last two weeks of Python commits, including