Skip to content

Content fixes followup#2560

Open
mnocon wants to merge 2 commits intomasterfrom content-fixes-followup