OSDN Git Service

Merging r339895 and r339896: