Merge proposals

Jari-tahvanainen has no merge proposals.