Merge branch 'master' of ssh://git.onelab.eu/git/tests