Merge branch 'develop'.  Updates to app/medm/Makefile.