Merge pull request #985 from oliverds/master

CDN images
Merge remote-tracking branch 'upstream/master'