Merge branch 'master' of ssh://sigrok.org/data/git/sigrok-cli