restored upstream/devel python

Still trying to get my changes into Peacock-2 branch.