0.9.x upstream changes

More doco updates and one of my changes.