bump version to 2.3
Merge branch '2.3.x_2.9' into 2.3.x_2.10