Merge branch 'jc/em-dash-in-doc' into maint