imageset handle background.png files
Merge remote-tracking branch 'origin/master'