Tweak docstrings.
Merge in latest master
Bump docs.