fix 1357
CS
Merge branch 'master-fix1357' of https://github.com/jygaulier/Phraseanet into jygaulier-master-fix1357