Add dependencies
Merge branch 'master'.