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