Merge the Sphinx projects into one.
Merge branch 'merge_docs'

Conflicts:
	docs/tech-reference/conf.py