[MERGE] Forward-port saas-4 up to 8b15482

diff --cc addons/account/account_invoice.py
Simple merge

diff --cc addons/mail/mail_thread.py
Simple merge

diff --cc addons/mass_mailing/controllers/main.py
Simple merge

diff --cc addons/mass_mailing/models/mass_mailing.py
Simple merge

diff --cc addons/web/static/src/xml/base.xml
Simple merge

diff --cc addons/website_customer/controllers/main.py
Simple merge

diff --cc openerp/osv/orm.py
Simple merge