CLC-2898 - Use same format for images
https://jira.media.berkeley.edu/jira/browse/CLC-2898
Merge pull request #1859 from christianv/CLC-2898

CLC-2898 - Use same format for images