Update NEWS.
Bump version to 3.1.1
Merge branch 'master' into avalon-dev