Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release
// AdminModulesPositionsController.php: wording
Merge pull request #1969 from AlexEven/release

// AdminModulesPositionsController.php: wording