import fixes from submitted PRs/SVN
Add category Makefiles from svn r349252