Merge proposals

Josep Ma. Ferrer has no merge proposals.