Merged Makefile fix from newview branch