commit from Makefile 20131115.1241