Fixes for Image Pack load
Merge remote-tracking branch 'upstream/master'
Tweaks to the Image Import process.
Merge pull request #910 from klkitchens/master

Updated to Image Pack import process...