Forgot the major changelog entry
Merge branch 'master' into develop