commit from Makefile 20131129.1804