Merge branch 'master' of ssh://fleuret@login.idiap.ch/homes/fleuret/public/git/selector