Merge branch 't/makefile_cleanups'