Readd missing dependencies.
Merge branch 'master' into develop