cosmetics
actually support delivery of jpeg
Merge commit 'github/testing' into beta