Removed FORCE target from Makefile.am
Merge branch 'master' into otr