Oops. Fix brokenness caused by revisions.
Merge in latest master
Bump docs.