Better support for specifying image files to load.
Merge remote-tracking branch 'origin/master'