Fix typo in the change log
Merge branch 'master' into gh-pages
Update doc