Merge pull request #833 from code-dot-org/test

DTP
Non-modified images need an expiry
Merge branch 'test' of github.com:code-dot-org/code-dot-org into staging