// updated instructions
Merge branch 'master' of https://github.com/PrestaShop/PrestaShopAutomationFramework
// travis quick fix
Merge branch 'master' into travis