Branch merge.

I moved the NEWS entry for the reindent fix to the right release section.