Merge pull request #2 from camptocamp/master

Resync with camptocamp modifications