Merge branch 'ps/gnumake-4.4-fix'