Merge the two Sphinx projects together.
Merge branch 'merge_docs'