commit from Makefile 20131120.2111