edit NEWS
edit NEWS
Merge branch 'master' into 85-code-dir