Merge proposals

Ales Kosir has no merge proposals.