Merge branch-1_7 2104:2105 into BSF git-svn-id: http://piwigo.org/svn/trunk@2106 68402e56-0260-453c-a942-63ccdbb3a9ee