Merge branch 'jk/doc-makefile-cleanup'