...
Merge branch 'master' into gh-pages
zoom and reset
Merge branch 'gh-pages'