Merge branch 'master' into clever-bump
support updating NEWS-style files when bumping version
Merge branch 'clever-bump' into develop