Merge branch 'rj/doc-formatting-fix'