Add test case for nesting mapped entities
Fix docs TOC depth

Conflicts:
	src/sphinx/connection.rst
	src/sphinx/introduction.rst
Merge pull request #830 from slick/tmp/docs-header-nesting-20

2.0 port of docs TOC depth fix
Set type when inlining aggregation functions.

Fixes issue #862. Test in CountTest.qOuterJoinLength
Merge pull request #867 from slick/tmp/issue-862

Set type when inlining aggregation functions.
Merge pull request #717 from slick/tmp/testNestedMappedEntity

Add test case for nesting mapped entities
Merge branch 'refs/heads/2.0-no-bin-compat' into tmp/2.0-catch-up-for-2.1.0-RC1

Conflicts:
	src/sphinx/introduction.rst
Merge pull request #876 from slick/tmp/2.0-catch-up-for-2.1.0-RC1

Merge changes from 2.0-no-bin-compat into master for 2.1.0-RC1