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