OSDN Git Service

Merge(backport) r6130 from trunk (#8777).