Correct Makefile.am #25
Merge branch 'typedup'