point distro.make to correct git repo
Merge branch 'master' into 7.x-1.x
Merge branch 'master' into 7.x-1.x
fix typo: xapi => api
Merge branches '7.x-1.x' and 'master'