// follwo up https://github.com/PrestaShop/PrestaShop/pull/2152
Merge branch '1.6' of ssh://github.com/PrestaShop/PrestaShop into 1.6
[*] IN: Fix #PSCSX-3486, enable colation_database for creating tables
Merge branch '1.6' of ssh://github.com/PrestaShop/PrestaShop into 1.6