Merge pull request #1361 from rouault/update_version_numbers_to_2_5