Final changes for 4.0.1
Merge branch 'develop'
Merge branch 'master' into develop