Merge proposals

Viesturs Teivāns has no merge proposals.