Merge proposals

Bartek K has no merge proposals.