Fix 'table of contents' for Dexterity types. This commit manually merges the relevant commits from pabo and pbauer to the master branch. It was not possible to cherry-pick or automatically merge this.
Prepare 2.3.8 release.
Back to development: 2.3.9
Merge commit 'eafed504987eaee78c4a020884b3ebebcbe72668' into relationfield-testing

Conflicts:
	CHANGES.txt