Bumped version number
Merge branch '4.0' into 4.1
Bumped version number