pulling in Makefile changes from master