Merge branch 'master' of ssh://comedi.org/git/comedi/comedilib