One more docstring tweak.
Merge in latest master
Bump docs.