Bumped version number
Merge branch '4.0'