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