Merge proposals

Hèctor Alòs i Font has no merge proposals.