Merge branch 'develop'
Update NEWS file
Merge branch 'master' into develop