//replace dirname(__FILE__) by _PS_ADMIN_DIR_ to prevent cache bug with __FILE__
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release