Merge proposals dependent on lp:~vauxoo/addons-vauxoo/addons-vauxoo-stock_dumb_wizard_export_csv-dev-fernando

1. addons-vauxoo-stock_dumb_wizard_export_csv-dev-fernando
2. Dependent merge proposals