Pull #5264 : get rid of re.match as @cvrebert pointed out