svn merge -r1494:1495 from trunk into branch 1.6 git-svn-id: http://piwigo.org/svn/branches/branch-1_6@1496 68402e56-0260-453c-a942-63ccdbb3a9ee