Merge proposals

ck+kernelbugzilla has no merge proposals.