Update explicitly-stated Python version reqs to 2.5+
Merge branch '1.8' into 1.9