Update documentation
Merge remote-tracking branch 'upstream/master'
Merge pull request #731 from emmanuel-keller/master

Doc update