makefile cleanup
Merge branch 'master' into develop
Merge branch 'develop'