Fix makefiles
Merge branch 'master' of https://github.com/Unity-Technologies/VersionControlPlugins