Merge branch 'develop'
Fixed submodule source with public repo.
Merge branch 'master' into develop