commit from Makefile 20131125.2234