changelog fix
Merge branch '2_10'