Port N3960 from Markdown