OSDN Git Service

Reconcile with jb-dev - do not merge