merge deEvo-1.9.x