Merge branch 'cs/pretty-formats-doc-typofix'