Merge upstream fix from com:REGEX