Updated dependencies
Merged with latest master