OSDN Git Service

Merge "Tweaks for forward-compatibility"