Fix recursive make
Merge branch 'master' into udev-keycodes