Removed incorrect dependencies.
Merge branch 'master' into develop