changelog update
Merge branch '2_10'
fix misc doc errors
Merge branch '2_10'