more changes
Merge https://github.com/686/python