Merge proposals

Shizuma has no merge proposals.