fixed few repo paths
Merge branch 'master' into tmp