Merge pull request #2 from OpenEdition/master

Update from original