Merge branch 'po/everyday-doc' into jch