Merge proposals dependent on lp:~openerp-dev/openobject-server/7.0-import-non-local-warning-mat

1. 7.0-import-non-local-warning-mat
2. Dependent merge proposals