Updating gh-pages automated API docs
Merge branch 'master' into gh-pages