Merge pull request #2370 from DavidKarlas/replaceQuote