Merge pull request #2085 from rubenk/non-recursive-make