commit from Makefile 20131111.1845