Create 2.4 branch; upgrade master to 2.5(-rc1)