OSDN Git Service

Merge changes from topic "am-8e0e30ce-6e2e-43b5-a842-3581d218043b" into oc-dev