Merge branch 'ma/double-dashes-in-docs'