Merge branch 'jn/makefile-cleanup'