combining 2.5 and 3.1 into one repo