Merge proposals

Fridrich has no merge proposals.