fix Makefile dist rule
Merge branch 'master' into keymod