final amendments
Merge branch 'master' into 0.7-rc
fix consistency
Merge branch 'master' into 0.7-rc
bump version in NEWS