OSDN Git Service

resolved conflicts for merge of d3501922 to master