Merge "Removed some junk from Makefile.am" into devel/master