Don't let tools/ do too much thing.
Update NEWS
Merge branch 'master' into general_index