// follow up https://github.com/PrestaShop/PrestaShop/commit/cd4f29e4671c80af4d8f13785be1e8c7e9480bc0id_order_invoice
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6