Porting development branch fix for getting images that don't exist
Merge remote-tracking branch 'upstream/2013.02' into 2013.02
Merge pull request #11 from erik-johnson/2013.02

Porting development branch fix for getting images that don't exist