Changed pkg to use git directly.
Merge branch 'dev-git' into dev