merge deEvo-1.9.x
Solve a merge conflict