Merge proposals

tryton-modules-web-shop in Ubuntu has no merge proposals.