merge forward from the python 2.x branch
7 files changed