escape expression when testing exact match #3269
Merge remote-tracking branch 'origin/staging' into staging