Merge branch 'po/diff-patch-doc'