commit from Makefile 20131211.1105