Refining the release notes.
Merge branch 'release-4.0.0'
Merge branch 'master' into develop