OSDN Git Service

Merge branch 'jc/merge-x-theirs-docfix'