Merge branch 'develop'
prepared for release
amended NEWS