Pull everything in as an example
Merge branch 'master' into gh-pages
Rebuild docs