Change upscm photo & image optim
Merge branch 'master' into gh-pages