Reset Makefile to trunk version.
Merge branch 'feature-parallel-build' into feature-vulcan