Undo accidentially committed changes to Makefile
Merge branch 'maint-2.4.0'