[FIX] web: cherry-pick of 893e4268650ddd517e3044f41c582fd92de6edfe & 61207f3f4d9206d4c1a3e484eb89f09d2258977a
Merge branch '7.0' of https://github.com/odoo/odoo into 7.0-linux64