commit from Makefile 20131126.1724
manual commit; not_Makefile is broken