Update dependencies
Merge master