Merge "Fix bug in regular expression stripping quotes."