Prepare for official 2.5 release