Preparing for 2.5 release
re-generated
Fixed a typo