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