Fix missing dep
Merge branch 'master' into central-server