Merge "Correct deprecation warning for $.quoteString"