Merge pull request #3220 from odoo-dev/7.0-opw-615322-rgo