amend contrib photo sizing to not affect thumbs
Merge branch 'master' into production