BUMP to 2.5 - freeze merging for a day :P

Change-Id: If5541f917ecd202fc215bac100c71ff8ef4fd375