OSDN Git Service

Merge from feature_merge branch. Build TortoiseMerge successfully.