commit missing Makefile.am
Merge remote-tracking branch 'upstream/master'