OSDN Git Service

Merge remote-tracking branch 'fdo/v1.7-branch' into fdo--master