small fix on upload of images
Merge branch 'hotfixes' into develop