Merge pull request #616 from odoo-dev/7.0-opw-608485-rgo