Fix dependencies. Again.
Merge branch 'develop'