Pasted in the v2.6 changes

And did some general cleanup for consistency, typos and format.