Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab