Fix docstring
Merge branch '0.10'