New version of the docs
Merge branch 'temp-branch' into gh-pages
New version of the docs
Merge branch 'temp-branch' into gh-pages

Conflicts:
	doc/_build/html/objects.inv