remove testing on python 3.1
Merge upstream changes