Merge documentation and version changes.

Which really should have been merged before the release.


[SVN r86738]