commit from Makefile 20131123.1912