Glitch in path for common makefiles
Merge branch 'hotfix/1.4.1'