merge 7079 git-svn-id: http://piwigo.org/svn/trunk@7091 68402e56-0260-453c-a942-63ccdbb3a9ee
merge 7080 git-svn-id: http://piwigo.org/svn/trunk@7081 68402e56-0260-453c-a942-63ccdbb3a9ee