[MERGE] Sync with trunk
[MERGE] Sync with trunk
MarkusTeufelberger/openerp-web,gisce/openerp-web,gisce/openerp-web,gisce/openerp-web,MarkusTeufelberger/openerp-web,splbio/openerp-web,splbio/openerp-web,MarkusTeufelberger/openerp-web,splbio/openerp-web