Update dependencies
Merge pull request #696 from emmanuel-keller/master

Update dependencies