Merge branch 'bc/maint-makefile-fixes'