[*] FO : Merge of https://github.com/PrestaShop/PrestaShop/pull/854 again
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap