Merge pull request #622 from odoo-dev/7.0-opw-592890-msh