quick fix for docs mention
Merge branch 'master' into gh-pages