Merge "Fix whitespace trimming in headings"