Fix dependencies.
Merge branch 'develop'