Merge remote-tracking branch 'odoo/7.0' into 7.0