Merge "Add option to expose original sha1 in thumb url"