Merge proposals

Pandora - LliureX 1306 has no merge proposals.