Sync with doc on master
Sync doc with master branch
Merge pull request #449 from emmanuel-keller/1.5

Sync doc with master branch