Merge branch 'filterclavier' of ssh://repo.or.cz/srv/git/calf