commit from Makefile 20131217.1049