Fix
Next version will be 4.0
Merge branch '4.0'