merged r1200 and r1209 from CEDMA refactoring branch into trunk. #479 (Crossover operators create trees that are larger than the allowed max size)