Update dependencies
Merge from master