OSDN Git Service

Merge master and fix conflicts