// Undefined index
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release

Conflicts:
	admin-dev/themes/default/template/page_header_toolbar.tpl