Merge proposals

Rihards Pfeifle has no merge proposals.