Fix bin/update-docs
Merge branch 'master' into gh-pages