Merge proposals

yoshua_64 has no merge proposals.