makefile fixes
Merge branch 'testing'
Merge branch 'master' into testing