commit from Makefile 20131126.2012