Bump version
Merge branch '4.0'