make 2.0 branch into trunk