Merge branch 'gh-pages' into elDorado
Merge branch 'elDorado'
Merge branch 'master' into gh-pages