#2358 Merge 2.12dev into 2.12multilang

git-svn-id: http://svn.ec-cube.net/open/branches/version-2_12-multilang@23149 1e3b908f-19a9-db11-a64c-001125224ba8