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