Add image upload support (bug 916919)