OSDN Git Service

Merge remote-tracking branch 'origin/2.3' into 2.4