Merge branch 'master' into gh-pages
modal open
Merge branch 'gh-pages'