OSDN Git Service

Merge "fix breakage caused by recent automerge"