use URLDecoder to ensure that filenames containing spaces are located properly
Merge branch 'issue687' into 1.6.x