Cleanup after 1.9-maint -> 2.0-maint merge.
Merge pull request #2418 from nawroth/1.9-2.0-merge

Docs cleanup after 1.9-maint -> 2.0-maint merge.