// Fix Country Warning bug

The warning was wrongly displayed for all non native modules
// Fix for Performance issue
//small fix
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
Merge pull request #1998 from LucasC/patch-1

// Fix Country Warning bug
// typo
Merge branch '1.6' of ssh://github.com/PrestaShop/PrestaShop into 1.6
[MO] : blocktopmenu - Correct top menu display issue #PSCSX-2607
Merge remote-tracking branch 'upstream/1.6' into 1.6