Merge branch 'piwigo-svn' (rev 22104)