Merge pull request #955 from alexey-svistunov/bootstrap

Added changes from eb94b51 TMMeilleur/PrestaShop