Fixed a crash when back-buttoning out of selecting an image
Merge branch 'ollieh-master'