commit from Makefile 20131204.2155