commit from Makefile 20131102.1200