Merge pull request #3041 from egig/develop

Prepare image url.