changelog update
Merge branch '2_10'