Merge "Making QuoteSpan more flexible."