OSDN Git Service

Merge "A couple of fixes"