Merge pull request #1 from geoadmin/master

Sync with upstream