[MERGE] changes from hub & odoo/odoo/7.0