Backport phraseanet fix from trunk.