2.5 release

This is the latest boilerplate