Version updates
Merge branch '4.x'