Remove redundancy in Makefile.
Merge branch 'master' into submitted