Update dependencies
Fixes #1300
Merge pull request #1301 from emmanuel-keller/1.5

Fixes #1300