Merge r372246 Makefile