Merge branch 'fix-non-exe-externals' of https://github.com/aroben/git into devel