Merge proposals

Ninj has no merge proposals.