Merge pull request #2 from PrestaShop/development

// Merge PrestaShop
[-] Carrier Wizard: Remove fatal error "Call-time pass-by-reference"
Merge pull request #600 from PrestaEdit/carrier_wizard

[-] Carrier Wizard: Remove fatal error "Call-time pass-by-reference"