Merge proposals dependent on lp://staging/~camptocamp/product-extra-addons/openerp6.1-module-fix-context-init

lp://staging/~camptocamp/product-extra-addons/openerp6.1-module-fix-context-init has no merge proposals.