Put docstring in the right place.
Put docstring in the right place.
Merge in latest master
Bump docs.