[-] CORE : Fix #PSCSX-3561 different template email for multishop
Merge branch '1.6' of github.com:PrestaShop/PrestaShop into 1.6