commit from Makefile 20131118.1132