fixes bug 1063100 - Roku and images on HTTPS
Merge branch 'bug-1063100-roku-and-images-on-https'