FIX: if root folder is set to '/' then all '/'s are stripped out of the image path
Merge branch 'imagefix' into combined