Removing phantom dependencie
Merge branch 'master' into testling

* master:
  Removing phantom dependencie