Drop support for Python 2.5.
Merge trunk.