commit from Makefile 20131119.1904