Issue #3282453 by chucksimply, robphillips: Fix support for quote encapsulated values and matches.