Updating master to be the 2.5 series