Merge proposals

Jordi Ballester (www.avangard-eis.com) has no merge proposals.