Patch from Edi Weitz to fix parsing of URI like '%25%23'