OSDN Git Service

am 7a6bd46d: Merge "A couple of fixes"