Docs.
Merge pull request #1192 from jmaas/master

Docs.