Merge "Drop support for Python 2.5"