#1147 some docstring formatting
#1147 some more docstring formatting
#1147 some more docstring formatting
Merge changes from release-2.0.0 to develop.