Add image upload support (bug 916919)

@cvan 
@spasovski