Fix cross references
Fix indentation and escape *args and **kwargs
Fix indentation issues in docstrings
Merge branch 'master' into rel_0_9