commit from Makefile 20131202.1250