Merge "(bug 23393) (bug 45803) Parser: Fix whitespace handling within headings"