merge with upstream odoo/8.0 and new api