Merge pull request #3058 from totten/mepps-4.4-secure-image-urls