Merge branch 'master' into gh-pages
type photo
Merge branch 'gh-pages'