No longer tests 2.5 to lighten Travis load
Merge branch 'public' into pypy