API change for upcoming 3.7.5 release.
Merge remote-tracking branch 'origin/master' into matthias/highres-image-example