Bump version number
Merge branch '3.0.x'