Make capture image import job a generic image import job.
Merge remote-tracking branch 'upstream/master'