OSDN Git Service

Merge branch 'upstream' into sliao_d