Merge proposals

autostatic has no merge proposals.