Merge pull request #725 from odoo-dev/7.0-bug-1235237-ypa